From 51ed0f393a23bbdf648181f8ff34c795cb617e9e Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Tue, 24 Oct 2023 15:29:23 +0200 Subject: [PATCH] module timespan --- include/siri/version.h | 2 +- src/siri/db/aggregate.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/siri/version.h b/include/siri/version.h index 15eb3573..3e84f1f7 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0" +#define SIRIDB_VERSION_PRE_RELEASE "-alpha-1" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/src/siri/db/aggregate.c b/src/siri/db/aggregate.c index 476b3a40..a70eb05e 100644 --- a/src/siri/db/aggregate.c +++ b/src/siri/db/aggregate.c @@ -232,17 +232,11 @@ vec_t * siridb_aggregate_list(cleri_children_t * children, char * err_msg) if (cleri_gn(cleri_gn(children)->children) ->children->next->next->next != NULL) { - /* result is always positive, checked earlier */ + /* group_by is always > 0 */ aggr->offset = CLERI_NODE_DATA( cleri_gn(cleri_gn(cleri_gn(cleri_gn(children) - ->children)->children->next->next)->children)); - - if (aggr->offset >= aggr->group_by) - { - sprintf(err_msg, "Offset too large."); - siridb_aggregate_list_free(vec); - return NULL; - } + ->children)->children->next->next)->children) + ) % aggr->group_by; } break; case CLERI_GID_F_LIMIT: -- 2.30.2